--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit c1cbc564595d1b4d1181bfa205f856809259ab58
Parents : 7cb53fe
Author : Mark Qvist <mark@unsigned.io>
Date : 2023-02-01T14:23:04+01:00
Kill log viewer process before exiting urwid main loop
Changes
Diff
diff --git a/nomadnet/ui/textui/Main.py b/nomadnet/ui/textui/Main.py
index deca22a..45584d5 100644
--- a/nomadnet/ui/textui/Main.py
+++ b/nomadnet/ui/textui/Main.py
@@ -140,6 +140,15 @@ class MainDisplay():
self.menu_display.start()
def quit(self, sender=None):
+ logterm_pid = None
+ if True or RNS.vendor.platformutils.is_android():
+ if self.sub_displays.log_display != None and self.sub_displays.log_display.log_term != None:
+ if self.sub_displays.log_display.log_term.log_term != None:
+ logterm_pid = self.sub_displays.log_display.log_term.log_term.pid
+ if logterm_pid != None:
+ import os, signal
+ os.kill(logterm_pid, signal.SIGKILL)
+
raise urwid.ExitMainLoop
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────